Merge changes from topic "am-b978c978aab74719b44cd5a6e6429bc4" into main

* changes:
  [automerger skipped] Merge "Merge ab/AP4A.240925.013 into aosp-main-future" into aosp-main-future am: 6809460c42 -s ours
  [automerger skipped] Merge ab/AP4A.240925.013 into aosp-main-future am: 873865762b -s ours