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

Bug: 385190204
Merged-In: Icac1f6467fe6fcdbaf744922381a44bd33e77db1
Change-Id: I0c9581dc426399eed930068856f95a2a61e712ce