Merge "Merge "WifiManager.factoryReset(): Fix incorrect permissions annotation" into rvc-dev am: 72ec4f1e am: 309860a8" into rvc-d1-dev-plus-aosp