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

Bug: 385190204
Merged-In: Iead20ce3c0eb5452719b562ecf90473b4a3b8a37
Change-Id: Ibd0b1bbbf9cb1d3818893183688b5807ce6e631d