Merge "Deprecate WifiManager EXTRA_BSSID, EXTRA_WIFI_INFO"