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

Change-Id: I1cc13641f08367784c772a08ec5aeffba08ea207