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

Change-Id: I8a74c635530eb54476481403dff5d806fdf6cd02