Merge "Give CONTROL_DEVICE_LIGHTS permission to the shell" am: 668daf0341 am: 285f6781c1

Change-Id: I118e59b1d9d3448ecb7e5bccffb3045c7828f45f