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

Bug: 385190204
Merged-In: Ic83bf3c4b937ce0a3e6ea50eb1fb0e7b12bef1c1
Change-Id: I8e113b8b3b72f9bcee2e40b4041472fbe331c83a