Merge "Use HwLight.type as the key of mLightsByType" am: ee4446c09e

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2198763

Change-Id: Id2ee0d209485830c792f8fbb6fc92c635dadde45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>