[automerger skipped] Merge "[DO NOT MERGE] Improve brightness handling during screen off timeout. am: bb8219d84b am: e0a4a75b35" into sc-qpr1-dev-plus-aosp am: 8567e1fa23 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15983243 Change-Id: I30539e04c905f61ec7648650e684552441f7a6f4
This commit is contained in: