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

[automerger skipped] [DO NOT MERGE] Improve brightness handling during screen off timeout. am: bb8219d8 -s ours am: 4cf6d3ee -s ours am: 2774a6f6 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Iba956f1095ac757437c3f11f571003ec1993670a