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

Bug: 347831320
Merged-In: If9ea56afc11e2978bc2b02cfeaf2ee08296a8804
Change-Id: I6fb4abbc3755306db0ff1c01b629dd12cf630475