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

Bug: 385190204
Merged-In: I99061851c9889bc24cc818f74c62827d36881639
Change-Id: I039561efe2f33fa1d1f706978c3d13f484401709