[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-dev am: 1b7cf6d9 am: a323fb50 am: a756bbee -s ours

am skip reason: subject contains skip directive

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

Change-Id: I38c02b0ad3694c7b40b86e1a632dfe28dff5150a