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

Bug: 385190204
Merged-In: I0b2b75f5a2532aaba0e0f53a1e32bcb544e4638c
Change-Id: I470ba852329026c0b7d847608968b4334b69a49d