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

Bug: 370570306
Merged-In: Ic855972acfe5ada2e6c92b8b3c9fb1fde63a9740
Change-Id: I6e16c41960cad613c681fdf3e5e7516fdf4bcebc