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

Bug: 385190204
Merged-In: Ia0d6121b08bcfdaad99cfcceff41c8861353d348
Change-Id: I73d7f248dfb2924a6e9a6121dfd25f3b4caeb3f2