Merge "aggressively blacklist WifiConfiguration for the purpose of switching network" into lmp-mr1-dev
automerge: d169839

* commit 'd1698393e71f4792f98156bb963e5876bc8c2eb0':
  aggressively blacklist WifiConfiguration for the purpose of switching network