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: I1f9dd37204351596cb652d7297e82e2c471d036f