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

Bug: 385190204
Merged-In: Iac0dfeb5d8452c8afa37e991fcfe729b26ac56da
Change-Id: Iba0d41d39392aee52e21e7b7839e1be8988924e2