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

[automerger skipped] [DO NOT MERGE] Improve brightness handling during screen off timeout. am: 2c26ea64 am: 536e96f5 -s ours am: 6d652973 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I746489a25ae20c99dbeb3dc1b88ab1bcae7de70f