Merge "Merge 24Q3 (ab/11976889) to aosp-main-future" into aosp-main-future