Merge "WifiManager: Remove unused methods" am: efb7bec56a
am: 718c90daf1

Change-Id: I8f2ead6f404dd3bdb1106d22f2fde756daef4cc8