Merge changes from topic "am-869612ecfd6a46e1a42e1033e590caa6" into sc-v2-dev-plus-aosp
* changes: [automerger skipped] Merge "[DO NOT MERGE] Improve brightness handling during screen off timeout." into sc-dev am:1b7cf6d9a4am:a323fb50fd-s ours am:2e10d56115-s ours [automerger skipped] [DO NOT MERGE] Improve brightness handling during screen off timeout. am:bb8219d84b-s ours am:4cf6d3eee8-s ours am:2774a6f652-s ours
This commit is contained in:
committed by
Android (Google) Code Review
commit
55b34bb234