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

Bug: 347831320
Merged-In: Ifed89c830a739e98f6e7b4db41882b458cf3da24
Change-Id: I775e8085e934067886061167f333b1e328a664bc