Merge 25Q1 (ab/12770256) to aosp-main-future

Bug: 385190204
Merged-In: Ia941d67a5248641246a7298487c6a13fe92d8d66
Change-Id: I9493e0ad863f30d8c5cdc0995d8d8f8ead03eadc