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

Bug: 347831320
Merged-In: I2141d527a5a6d0a3b4f31911b5a468c885b8a782
Change-Id: Icccca7d6707251ee2da406d2f8c04a65a63ff193