[automerger skipped] Merge "Give CONTROL_DEVICE_LIGHTS permission to the...
[automerger skipped] Merge "Give CONTROL_DEVICE_LIGHTS permission to the shell" am: 668daf03 am: 285f6781 am: 30afdb53 -s ours
am skip reason: Change-Id I2b4224e79e013bae27ee068b0a0898b5afa5489a with SHA-1 413dd364 is in history
Change-Id: Icaa2ce2ef30ea16b5920bb45d663c444da597c91