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

Bug: 385190204
Merged-In: Ia8c27c5031bb14d77f581b4569a8d39a5613244f
Change-Id: I1d15a54365a7bde3b22673cd891df0aa699807cf