Merge changes from topic "am-242e7057c303476d9bf9b440aeb2b9a6" into sc-v2-dev-plus-aosp

* changes:
  [automerger skipped] Merge changes from topic "b196691596" into sc-dev am: 7b3e40dd63 am: 17a68e2bb4 -s ours am: 258a30ee51 -s ours
  [automerger skipped] Limit refresh rates if skin temperature is high am: 7e783bb071 am: 18188ea718 -s ours am: 1730e32644 -s ours
This commit is contained in:
Automerger Merge Worker
2021-09-29 19:16:00 +00:00
committed by Android (Google) Code Review

Diff Content Not Available