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

Change-Id: I7bc7504eaa93b25d6aec1b4b5e337a14085639e7