[automerger skipped] [DO NOT MERGE] Improve brightness handling during screen off timeout. am: bb8219d84b -s ours am: 4cf6d3eee8 -s ours am: b9688e4252 -s ours am: 868867f506 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15974634 Change-Id: I247d8698da17b3029e8e3fa10cde5d757ed3d1fa
This commit is contained in: