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

Bug: 385190204
Merged-In: I31e9f6f7bc529599b2d48f61ff0e32ba70c4dd12
Change-Id: I3e088bd73753942d013cb5368705d13d53c0cbfb