[automerger skipped] [DO NOT MERGE] Improve brightness handling during screen off timeout. am: 2c26ea64bc am: 536e96f50d -s ours

am skip reason: subject contains skip directive

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

Change-Id: I746a74cbc43af3ee602b52acd5fadc6c51e54661