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: f4ff7f9d am: 09f63053 am: bad5e281

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



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