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

Bug: 385190204
Merged-In: I99b870299241be06858bf4e5210ad991a344ce6a
Change-Id: Iccb4105f78ef82ec46a8477bcaf0b1386b5c14ad