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