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

Bug: 347831320
Merged-In: I066d2178a760aedc4f2dc2fcd2c048abb72488f1
Change-Id: Iadbe512f58cd8d2ff7fadb0fc5e5588eec04f580