Merge ab/AP4A.240925.013 into aosp-main-future

Bug: 370570306
Merged-In: I0d5ae482f51fd590946fca0e9a98fa9b8a0b0fa2
Change-Id: I9b75af84f7afe09acbf36a480a109b0bc6b1e022