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

Bug: 347831320
Merged-In: Ib6fa3feb5d4594c47ec054b9b44666ba0638a328
Change-Id: I283d4b8fcacf3b5b7749ed3eca9f03459290e50b