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