Merge "Merge "Allow WifiSettings to show old APs on app resume." into oc-dev...
Merge "Merge "Allow WifiSettings to show old APs on app resume." into oc-dev am: 683a7e2b -s ours am: ea46967c -s ours" into oc-dr1-dev-plus-aosp
am: bb71287d -s ours
Change-Id: Ie95eb695e4e8453d5b0bd3785de0c0668e394149