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

Bug: 347831320
Merged-In: I5f79e8055d61017d48eac58e258cdc00113274ee
Change-Id: I3dac8932d05d22827fab8ac472fd04964056676e