Merge "wifi: remove @Deprecated methods in IWifiManager.aidl"