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

Bug: 347831320
Merged-In: I0493b98e6a3268fabeb9a058a26c86282532a4e0
Change-Id: I04a99179878102eaead9f381ac5f28df617b3348