[automerger skipped] [DO NOT MERGE] Improve brightness handling during screen off timeout. am: 2c26ea64bc am: 536e96f50d -s ours am: 6d6529736e -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15974454 Change-Id: I746489a25ae20c99dbeb3dc1b88ab1bcae7de70f
This commit is contained in: