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

Bug: 347831320
Merged-In: I1a6a89435ccd37ae12931bb9870dc24590c44887
Change-Id: I8ba69a8d7dbf1230dced05b369b6f7a24ca19b92