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

Bug: 370570306
Merged-In: I24ba47dafb991c395fa27ba7585c907e7b9f1920
Change-Id: I8135d9fc864491b767991a8f25fd71928b1367f8