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

Bug: 385190204
Merged-In: I517c0a3e615da91dafe7735a9aca1f767572946b
Change-Id: I742f8e9ecff6b41c6acef1b291838a7cad77772a