Merge "WifiManager: Remove unused methods" am: efb7bec56a am: 718c90daf1 am: 4898225abc
am: 186159de58

Change-Id: Ib934238d344f206990a31d99cf79e299e8fe8160