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

Bug: 347831320
Merged-In: Id0fd8b3336658515c33c745986f14c2023cccd78
Change-Id: Ia4603a3479446d4544819fd216b084efd9ba28a6