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

Bug: 370570306
Merged-In: Ide8d92d2466a993af041de3a62d25b375f5b4dd7
Change-Id: I7525c265e0aca6cda2d2cd9a5d03494fda96c90d