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