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

Bug: 385190204
Merged-In: I24e49a5629ea0083c460a50bee72439d31d22ed4
Change-Id: If18bfa12c17a4b71ec3d415dd8bfcc26b3b60b71