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

Bug: 347831320
Merged-In: I9cb155e852cab0965550cfb45815c89d96745e30
Change-Id: I5795e535b5a06e569cf9d3e64d07d28c989b8b79