[automerger skipped] Merge "[DO NOT MERGE] Improve brightness handling during screen off timeout." into sc-qpr1-dev am: 29be39a18e am: ed7b18496a -s ours am: 51d2958cd4 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15974454 Change-Id: Ia2ae1e47cd1add2cf89f149850ba9006aaf1bed2
This commit is contained in: