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

Bug: 347831320
Merged-In: I4cc82131bb070a37cb6ed9dbe9d7cccc7ab5ee89
Change-Id: Ica12b0b35751b17c1ee50fc1aa72c0fd075e0f71