Merge "WifiManager: Remove unused methods"
am: efb7bec56a

Change-Id: I68d2ee571f04136a7c4babbdfa097d5449cc5ac3