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

Bug: 347831320
Merged-In: I188263ee9b186736a48fd3a0cfa83745e2e54108
Change-Id: I991fd3f5e3eff2c7c2aa7a0c41c3929755a13244