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

Bug: 370570306
Merged-In: I0004cd58696f92627c0c94747a696dd38dbaeb45
Change-Id: I1137b8c31c6afc66b27e0baea963f31102a880ed