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

Change-Id: Ic398fbad1492c19db947462d0c54cf9391de58e3