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

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



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