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

Bug: 347831320
Merged-In: I6c7740ac21ed67d65493dd973649bbd7d12acb01
Change-Id: If498ba1bdb0292f561f803eeacaf3bcd7f8b0c53