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

Bug: 347831320
Merged-In: Ie4006bf481d78bb408423ac745daee17b7e9e300
Change-Id: Ifedfd034969a2d900a335429259d9e278bed3bc0