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

Bug: 347831320
Merged-In: I07a98712e6f2fb3d1ce0a2e5f97693cdfbeb3582
Change-Id: Ic965772a95e46326dc54b2d0f52a371479844599