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

Bug: 385190204
Merged-In: I57f32af9b093992e6ccaa8dc70ebe9a22ed328b0
Change-Id: I684f2093158326543c1f0a71af4fae2583a6816b