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

Bug: 385190204
Merged-In: Ic23dd4885b37c2f5f7880e17fe1a83048c393fac
Change-Id: Ifd1565a80cb9465f8023f8b95f1864a19394efe5