Merge "[automerger skipped] WifiServiceImpl: Allow setWifiEnabled for system apps am: cdebeb98bb -s ours am: d8e9d04342 -s ours am: b20eeb89e9 -s ours
am: 66fd393a1c -s ours
am skip reason: change_id I095f9755c60034064e467dedcdb16b33dc63d9eb with SHA1 bc68567d3b is in history

Change-Id: I526d06e098aef1bd224b83ce40bdb75294698da0
tree: 349aeb2e9c9f0bc5c51ecc6b5ee1d8e6618bcf95
  1. service/
  2. PREUPLOAD.cfg