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

Bug: 385190204
Merged-In: Ia3cc45fce69a43d96a9eab9922ec8355c1b253c6
Change-Id: I9b40d15917d19a6e6def736db16db7b0dcff4e62