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

Bug: 385190204
Merged-In: Ifd6ca8274d9f77a5fcaa43ccf3cd18728067bcf6
Change-Id: I24481a079a7477bca903e84bd9197663324cd599