Merge "Only update the display when brightness and state are valid." into...

Merge "Only update the display when brightness and state are valid." into sc-dev am: 10db7a41 am: 6bad1e88 am: be9fa34a am: 6b6e403b

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

Change-Id: Ifc2a9272ad837cc0ecc5fc97e0fd913dc79e5ae9