Merge changes from topic "brightness_nits" into tm-mainline-prod am: c19dfec1

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



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