Merge "Only update the display when brightness and state are valid." into...

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

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

Change-Id: Iab199169e3cb444050f48b81c8e7fadef98c45c9