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

Bug: 370570306
Merged-In: I96f429ec3284114868ad220ea308a6920930c065
Change-Id: I15a1c680b1877aa299e5c865a5a78c6ce2bd4a62