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: 979d93aa

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

Change-Id: I96f2501e62e986b37cce3a364e44c9c7c1cb2c52