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