Merge "Stop using IWifiManager in AccessPoint"