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

Change-Id: I926c1fc7e03fc49c220796692fbcf3bea48c4125
tree: 3a2add0288bd3b6c4d589fd36e95f3c02b3085e6
  1. service/
  2. PREUPLOAD.cfg