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

Bug: 347831320
Merged-In: If0eb75bff237c6bab1dba21724abefc395ec2f02
Change-Id: I708ebcb4a56773b6e567a6af3def257a240bf84f