Merge "Allow WifiSettings to show old APs on app resume." into oc-dev am:...
Merge "Allow WifiSettings to show old APs on app resume." into oc-dev am: 683a7e2b am: 0c02e22c -s ours
am: 51b31c53 -s ours
Change-Id: Idcb397b3de44fc56c92340032171cb80f46e86e6