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

Change-Id: I399d70e9c605d8129aa2e8ec59fa0ddbaeb63c5e
tree: 66489d2e1bffb5661ef2b8daf15e679dca8d7983
  1. service/
  2. PREUPLOAD.cfg