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

Bug: 347831320
Merged-In: Ib6a297c99f3deda10e15637c5bb89fa575e77967
Change-Id: I3c0eab3f24646c49a49ab6f5b8130d8d5e0633df