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

Change-Id: Ie6ae5f041d7f081de040591fab697b38b0dc95ed