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

Bug: 385190204
Merged-In: Id8b37f9f209389eec7eda27f19af01ce419db94d
Change-Id: Ib61e217e3df7075c897bbe66bc081bf5a6519826