Merge "make autojoin configurable, clean up BSSID info that may be stake in WifiConfiguration" into lmp-dev