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

Bug: 385190204
Merged-In: I8f9f86c66864b3fe4d1200c560283fc71573898e
Change-Id: Ied3e095394fce7dbd0cecde1fcb14620bc72c658