Merge "Ensure invalid brightness values aren't used" into udc-dev am: 0dd48988 am: 2f95beb0

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



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