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

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

Change-Id: Ib7fa407c7fcf9d4197bbe5f7f5829c250e81da9d