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 am: 4b122bdf

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

Change-Id: I6152e065154a16c02442e2b7442af674f8db6f8d