Merge "Add AIDL Lights HAL to support multiple lights per type" am: e961dddd15

Change-Id: I715f52fb202b8f791fd0a8520ce7b2fe95c899f0