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

Bug: 385190204
Merged-In: I0921a9e6982067c3f254328c85089d4349006c52
Change-Id: I376b5983e5cb28f630cd4ad994392f2d0e1f64a3