Merge "Merge "WifiManagerTest: check softap mode supported" into oc-dev am: a2283cd312 am: 88d9f08c93" into oc-dr1-dev-plus-aosp