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

Bug: 347831320
Merged-In: I73765bee6b5bcbd6cd4ca48cf99c85baea05bb63
Change-Id: Ib2b0084d080b8fa24519c5437892d60f91fa3b55