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

Bug: 385190204
Merged-In: I69c8d96c8d8532d3eb8af8e9b4470ef50bd172c1
Change-Id: Ib9d6f2bc1990c8d0ca165945196eee2764fde06d