Merge "Merge 24Q3 (ab/AP3A.240905.015.A2) to aosp-main-future" into aosp-main-future