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

Bug: 347831320
Merged-In: Ia9b103579eea0859212523729a0d2e63b0f1c0fb
Change-Id: I427ddb898d9a7de3a570ce33613e3a6810c86482