Merge "[DO NOT MERGE] Improve brightness handling during screen off timeout." into sc-qpr1-dev am: 29be39a18e

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

Change-Id: Ic9001f09694c316d76fdc90b72883995dccbfaac