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

Bug: 370570306
Merged-In: Idf22d6e72e7d618ed98e869142b5cc5dc785985e
Change-Id: I6ce6c166f47f918a2bee7c465f6290b7c53af714