[automerger skipped] WifiServiceImpl: Allow setWifiEnabled for system apps am: 1b7ee011ff -s ours
am: 10c7b6ab96 -s ours
am skip reason: change_id I095f9755c60034064e467dedcdb16b33dc63d9eb with SHA1 1b7ee011ff is in history

Change-Id: I8323b564e120b0cede1e48b0ffd3622367ff3762
tree: f9064ef436d51e612d626daca2ae658336be8f3d
  1. service/
  2. PREUPLOAD.cfg