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

Bug: 385190204
Merged-In: Ibca9b625eb0dd7d00872fc5222d894367c5653e9
Change-Id: I0f7b37dec2fcb54ad85da5cc46dd25e5174c9a3e