This is a similar code merge of ag/489459. Bug: 143328194 Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiSettings2Test Change-Id: I666b3293f00aa1822a6fdcc3760ae19d27019597
This is a similar code merge of ag/489459. Bug: 143328194 Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiSettings2Test Change-Id: I666b3293f00aa1822a6fdcc3760ae19d27019597