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: 1b7cf6d9 am: a323fb50 -s ours am: 2e10d561 -s ours
  [automerger skipped] [DO NOT MERGE] Improve brightness handling during screen off timeout. am: bb8219d8 -s ours am: 4cf6d3ee -s ours am: 2774a6f6 -s ours