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

Bug: 385190204
Merged-In: I2e6445e248afe9c0a6e58d23e9faa983b3864007
Change-Id: I76aca1e5db1c1710c838a0339d0cde8fb961bfd4