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: ee4d3e1e am: f53dde26

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

Change-Id: I4ff96546c798b2e86ae220fa81419c52d4af35b3