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: I99605ceba2b8f88f131867fc032f30f8c3edbb82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>