[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: 1b7be7a9 am: afbbd131 -s ours am: 17ee7caf -s ours

am skip reason: subject contains skip directive

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

Change-Id: I7820b7d2066e3174fb01bd0570b98002139e86ef