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

Bug: 347831320
Merged-In: I755d000d2fa39bac5b7ea480baf21d1bf8b5067b
Change-Id: Iab54cd11e8ac46c5304a51696200f179130e8081