am 0689adb0: am a5ef501a: am 9e444d7a: Merge "make autojoin configurable, clean up BSSID info that may be stake in WifiConfiguration" into lmp-dev

* commit '0689adb05583357b213ec0ce491cdcd5a7080074':
  make autojoin configurable, clean up BSSID info that may be stake in WifiConfiguration