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

Bug: 385190204
Merged-In: I1036efd67db88d6436123ce0a2e429fed08f05b7
Change-Id: Icafad9d30331c3dfb44ad3670e44e04e632b1a57