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

Bug: 385190204
Merged-In: Ia50beac7854aa565be56b0ce188b7290c4157687
Change-Id: I77e7f25b45ca82cc9e2139e6ba114d947e3c10a8