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

Bug: 385190204
Merged-In: I05847d459b0b16e686cf0ff6f2bc1a217d15e45e
Change-Id: I25d8217ba24b49e94aafc0d549a87706b4083a84