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

Bug: 347831320
Merged-In: Icec0b50f6421770e15c40b0676b49b95b035c230
Change-Id: I55cb14376d65350406010fba11875b7bab26acee