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

Bug: 370570306
Merged-In: Ic5f8497f8dfb7d22dcc97555a8420b5397b55e12
Change-Id: I75a4eba0dbfa7dfe7a30c41f2401ebafeb05f0dd