Merge 25Q1 (ab/BP1A.250305.020) to AOSP main

Bug: 385190204
Merged-In: I8bef2480af3a9bb0337eb5a1bdc08cf39bc06a9d
Change-Id: I487eac1dc7fa69f7a07b7eb5595309039fd2be7a