Merge "[automerger skipped] WifiServiceImpl: Allow setWifiEnabled for system apps am: cdebeb98bb -s ours am: d8e9d04342 -s ours am skip reason: change_id I095f9755c60034064e467dedcdb16b33dc63d9eb with SHA1 1b7ee011ff is in history" into qt-r1-dev-plus-aosp
tree: 66489d2e1bffb5661ef2b8daf15e679dca8d7983
  1. service/
  2. PREUPLOAD.cfg