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

[automerger skipped] Merge "[DO NOT MERGE] Improve brightness handling during screen off timeout." into sc-qpr1-dev am: 29be39a1 -s ours am: f23e4f00 -s ours am: 0ac6aa61 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I06f9ecb1f3b53d1bc3e36b2e0280e04c23094b46