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

Bug: 385190204
Merged-In: I00a1b3862c3a11d56808330bdfd4ab87fcbe0792
Change-Id: I1ef580be20ede8800514a5f419d2e1c15780cfda