[automerger skipped] Merge "Respect halControlsIllumination provided by the...

[automerger skipped] Merge "Respect halControlsIllumination provided by the HAL" into tm-dev am: de84e3f0 -s ours am: 0ee938ef -s ours

am skip reason: Merged-In I665b8c6a131ff3fd66701fea7ca6368e33b39c13 with SHA-1 faae3453 is already in history

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



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