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

Bug: 385190204
Merged-In: I6f434094d9886f0aabd4df03e0d170578c15b457
Change-Id: I0c2c2f903c953591a491436a91ff472549e92a36