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

Bug: 370570306
Merged-In: Ic19ff6af1a86f94853e8d2c65012ee247ae25bde
Change-Id: Idbaffc65743da6b0daf9af80398b3f409d9c2a3b