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

Bug: 385190204
Merged-In: Ifb162ad71e7dcef139edbdb6edb6f6347b1ed93a
Change-Id: I8efc561ec3a50f5cd07c2f557cc5ca4485751c03