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