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

Bug: 370570306
Merged-In: I1403fb64502e5b731ae08a51df8198801314c951
Change-Id: I97c4bbc657da5823aa9fe9d17563a77e06743fba