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

Bug: 385190204
Merged-In: Iedf4e9283c2e5f20ae818abfcf475fefe953c9c8
Change-Id: I9f295facbebba670f28c16fe378f136f119b91a5