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

Bug: 370570306
Merged-In: I3bfb6b322388c4f39e3370c6c1e1792dfe48ded4
Change-Id: I5e97d9c62c009eb82d9ff3632fb4064ba5717fb3