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

Bug: 385190204
Merged-In: I5ac0ea836c9602dc42a08db8cf7aba9c51ecf478
Change-Id: I0a0fccd35a1d3eabd77cee67543fcb3bd4c6f3ab