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

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

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



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