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

Change-Id: Icfe7abd987ad1f4b6a0475904759cc87eb61a00a