Merge "Force update APs when enabling wifi in WifiSettings." into oc-dev am: 9797a39ad7
am: f292f23c0c

Change-Id: I5490aab1d5b4845f912c6fcefda76587e09366ea