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

Bug: 370570306
Merged-In: I195f779cc6588c37ccdbe4bb8b29ee8f2edd861a
Change-Id: I4ef5ab22379c7c42e0b3dfbf4862e118b2ce6300