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

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

Change-Id: I6bb57b8f7a45d6ea9c4a0e7957f9d0884b61a417