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

Bug: 347831320
Merged-In: I2bb62ca28f73bf858e11eee4aa6c452e18db1ea4
Change-Id: I92047a700edb9cc00f825411638048940d83994e