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

Bug: 385190204
Merged-In: I514eb622b02f13b23aa3f9fe9c699b856a196c00
Change-Id: I317e5608522be501865a16ba30a941536621a486