[automerger skipped] Merge "[DO NOT MERGE] Improve brightness handling during screen off timeout." into sc-dev am: 1b7cf6d9a4 am: 1b7be7a91d am: afbbd13149 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15974634 Change-Id: I5e367d657fa288fc2da94ea2960be6187fe9d07c
This commit is contained in: