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

Bug: 385190204
Merged-In: I357c286ba5a4cbc3d156a9b628b26e3bb106b955
Change-Id: I4016403b05d146e73f3cd554f4436072deff3c72