Merge "Remove implementation of bssid hotlist" am: 62c5f64fa5
am: 37a1d983fe

Change-Id: I546410e5a0efbbdddee526cd494ba33a6eb1005b