Merge "aggressively blacklist WifiConfiguration for the purpose of switching...
Merge "aggressively blacklist WifiConfiguration for the purpose of switching network" into lmp-mr1-dev
automerge: d1698393
* commit 'd1698393':
aggressively blacklist WifiConfiguration for the purpose of switching network