[conflict] Merge "Merge "Add basic structure for keyboard backlight indicator...

[conflict] Merge "Merge "Add basic structure for keyboard backlight indicator functionality" into tm-qpr-dev am: 44aa0c7f" into tm-qpr-dev-plus-aosp am: cf78af27

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



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