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

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

Change-Id: If89ed07c25fab0976bbefa67d7963b12c8a932a4