Merge "WifiManager.factoryReset(): Fix incorrect permissions annotation" into rvc-dev am: 72ec4f1e am: c6b6ac43 Change-Id: Ic3ac126f442a657b3b4fa921a6d77460ab742978