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

Bug: 385190204
Merged-In: Ibee4708e98cc026b23252ae8c1790bac48060b92
Change-Id: I095139f56da974a6cce3c0b3b590a6dae76c5e09