Merge "WifiManager(aidl): Remove pingSupplicant binder call" am: 3777874320 am: 673de5b39d
am: d0919ba9c4

Change-Id: Ia955905826f7b7a2219086121212f4498ca92993