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

Bug: 347831320
Merged-In: I40f5e3eb49ebd1ca212c182d65c5b67f1e879d57
Change-Id: I7150234fcbe1cbeebf236b5cc9b070c13fac3345