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

Bug: 347831320
Merged-In: I9062ec0263cbad01089b0fb8a9d4fb806d1bb88a
Change-Id: I5785de256ef2524a33f53314c050a9ac04e0393e