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

Bug: 370570306
Merged-In: Ib023bdbcba48311a906128bd7394106a01e47dee
Change-Id: I5deeff219bb87b0857a07d0a3a3bbc5c6edd52e7