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

Bug: 385190204
Merged-In: Ie524eb30bd88bddb926f038bcb430bc1b3f42350
Change-Id: I708b423317d1fa3acbdf2dfb7cd8a1c795ffd4b9