[automerger skipped] WifiServiceImpl: Allow setWifiEnabled for system apps am: cdebeb98bb am: a64c0ea563 -s ours am: 092a8261c8 -s ours
am: 2a7b5ff4a9 -s ours
am skip reason: change_id I095f9755c60034064e467dedcdb16b33dc63d9eb with SHA1 bc68567d3b is in history

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