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
automerge: 0a22d43c
* commit '0a22d43c':
aggressively blacklist WifiConfiguration for the purpose of switching network