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

Bug: 385190204
Merged-In: Ie486d73bc3dfe74f5048bd132e2ea68ab8e7b006
Change-Id: I7fc1095d8073981da318810c16a0c46abf80995d