Merge "Merge 24Q4 (ab/12406339) into aosp-main-future" into aosp-main-future