[automerger skipped] Merge "Add AIDL Lights HAL to support multiple lights per type" am: e961dddd15 am: 5e01d06cfe am: 46a0fbe1e8 -s ours
am skip reason: Change-Id I08d831ca0380d8bb187e43f6d5c214810ff72f50 with SHA-1 bb89a958e5 is in history

Change-Id: I47d9b8ab73ed04bbee626ea1a1a3e57c23386690