Merge "[DO NOT MERGE] Improve brightness handling during screen off timeout." into sc-dev am: 1b7cf6d9a4 am: a323fb50fd

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

Change-Id: I6f0c5b7c7c7c274ce2ffb2970a79307551064c42