Merge "Rematch wifi networks when the avoid bad wifi setting changes." into nyc-dr1-dev am: 4813790d95
am: 488ca21f0a

Change-Id: I5284a99c478a77187ce0e115b07248d89e6886a6