Merge changes from topic "am-335c105526d44df48ef26fa2789991ec" into main

* changes:
  [automerger skipped] Merge "Merge UQ1A.231205.015" into aosp-main-future am: 490e264eed -s ours am: 15cd320cf9 -s ours
  [automerger skipped] Merge UQ1A.231205.015 am: 5da189e0a7 -s ours am: 1e8815c1e0 -s ours