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

Bug: 347831320
Merged-In: Ice09a7ad54167e68cd2dc892692fc49a0afbabc1
Change-Id: Iff912f47972fa25834be8d11008ffbbe2d1ad86e