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

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

Change-Id: I8751ca41793cc94016292bdbb42758df3becac9b