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

Bug: 385190204
Merged-In: Id02e66534ad65504a8e8a03e843f7bb309f01f1a
Change-Id: I057a8a0e569dc4937c38859a97a9fbd0b7d9c9b7