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

Bug: 370570306
Merged-In: Ib667aaa8e7c67ed2d20cc9418b52df92f49f5c59
Change-Id: Ia7a046ccb98e15569c5e9523497d9ef986771643