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

Change-Id: I1cacc2f888f429932b6506c9e9d216f2a502e354