Merge "Force update APs when enabling wifi in WifiSettings." into oc-dev am: 8025906b7c
am: 05f252ec53

Change-Id: I77d68fe604e84e16aa545b119be96241b855abf6