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

Bug: 347831320
Merged-In: Ie924cf59efd0dc9e97fb8a10f6ab3f2e7a7e4fd9
Change-Id: Id47e5b81dee0f283779dd17f4da5942365cbb8d0