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

Bug: 385190204
Merged-In: Id876c7ccac63b57842b2fd3e773c4d1236f21f4f
Change-Id: I44e63bd7593bac6e5a4db67377872767454fe18c