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

Change-Id: I67231a34a7cec923a6017a07aa7367f449000ded