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

Bug: 370570306
Merged-In: Ie97ef69f6f9e7209e65c600ac78639a1c40e0fd5
Change-Id: I2cc14a5ca39f0e219bea472fdb7c0ceda6ef4430