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

Bug: 370570306
Merged-In: I4971b72eac0a3efbf7d7491a5ae10b3c647dc4a0
Change-Id: I098bc3afe076f45d3d684bc8f780765a84e6a012