Merge "WifiManager.factoryReset(): Fix incorrect permissions annotation" into rvc-dev am: 72ec4f1e80

Change-Id: Iad5a64a949d0c99afa54fb5e75b559826100b55a