Merge "[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" into udc-dev am: f3efc71a am: a36111ac

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



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