Merge "WifiManager(aidl): Remove pingSupplicant binder call" into oc-dev