[automerger skipped] Merge "[DO NOT MERGE] Improve brightness handling during...

[automerger skipped] Merge "[DO NOT MERGE] Improve brightness handling during screen off timeout. am: bb8219d8 am: e0a4a75b" into sc-qpr1-dev-plus-aosp am: 8567e1fa -s ours

am skip reason: subject contains skip directive

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

Change-Id: I30539e04c905f61ec7648650e684552441f7a6f4