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

Bug: 347831320
Merged-In: Ifaa7f5438f1ad9a745a72a416bd80ea2f3fecae8
Change-Id: Ia0cbc6b73cb40f70e580a0a1d95e328deec24864