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

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



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