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

Bug: 370570306
Merged-In: Ia507354f42959ce9d320114a313bfc533186b524
Change-Id: I2cf8baad00355252c5621766e1da472c87007f9d