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

Change-Id: I702dd7b8f6fc1c1a7307d26770b1a61f376f8389
tree: fadaec429d5379e9a83fd4792981cbf55c481e35
  1. service/
  2. PREUPLOAD.cfg