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

Bug: 347831320
Merged-In: I70a7d579cbb86c193c3b84f034cca0afff588c98
Change-Id: I7d2bd232799bdc12951948319131138c1f37490c