Merge 25Q1 (ab/BP1A.250305.020) to aosp-main-future

Bug: 385190204
Merged-In: I1ef46e98629c9aa7ea364e83153b55779e7486ea
Change-Id: Idf89b322395a1c8ca110825f741738c32908d012