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

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