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

Bug: 385190204
Merged-In: Ic4d9d6c4f79325a5d7ab98eafa1c86db4c2e67a5
Change-Id: I0624a775467138ed050b94b61bf5be69b6e7606e