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

Bug: 385190204
Merged-In: Icd2865c2761eaf3b7cba9b8b62a45a55b43cc5f0
Change-Id: Ie542d771fbde48fcaf801153f751b0b4b0421629