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

Change-Id: I11e5afc9813fe629c131936d3587d1d260f3ede8