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

Bug: 385190204
Merged-In: I282b1f9108a1f3481b57dd0a08da8a446232d2a5
Change-Id: I88ca108b120338066197626bbabcfff39f721a60