Merge changes from topic "am-ba8e732341f341dd95f0623bd89c0433" into main

* changes:
  [automerger skipped] Merge "Merge 24Q3 (ab/11976889) to aosp-main-future" into aosp-main-future am: 46b645ecb4 -s ours
  [automerger skipped] Merge 24Q3 (ab/11976889) to aosp-main-future am: 4af9720383 -s ours