Merge "Merge ab/AP4A.240925.013 into aosp-main-future" into aosp-main-future