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

Bug: 347831320
Merged-In: I002afe0ac6ad47701ae9857fd344a350446aeada
Change-Id: Icf41fe20cf36c26f42bcb2f13c068a4380d37142