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