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

Bug: 347831320
Merged-In: Ie8571e883132cfaa5a054cdcf4c3a827fa215014
Change-Id: I14e0b8ef0aca63213656000a155e395379b088c1