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

Bug: 370570306
Merged-In: Iccb22027040315514c73bbb228d118dd03182635
Change-Id: I0b2706ceea1fce5e7b1558f676dc739e310a1b3a