[automerger skipped] WifiServiceImpl: Allow setWifiEnabled for system apps am: d8d7cbce40 -s ours
am: ab1b05af55 -s ours
am skip reason: change_id I095f9755c60034064e467dedcdb16b33dc63d9eb with SHA1 b46e815669 is in history

Change-Id: I6a4526611e4d7c7743fd58b55980d258c8656596