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

Bug: 385190204
Merged-In: If6a3cadc6907d0742fa80cac7ee85861901d382b
Change-Id: I6c5cdf0c3c5f6a592fa41a6386a688b6d3aaed69