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

Bug: 347831320
Merged-In: I57ddbef96cb56cd5e2349825123fe099ce0df106
Change-Id: If2b11cf7f43ed62ae75b8eda427018515c66aa36