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

Bug: 347831320
Merged-In: Ia3e13839cd8680a09637c64067bba21b1b74aa2d
Change-Id: I7e7fadc31d87e57df852fc9c320860293c001dd3