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

Bug: 370570306
Merged-In: I624d3017a56da667598a7484e90479454b889632
Change-Id: Iea61a968633696d76e075d2e4bd20b64792fbef2