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

Bug: 385190204
Merged-In: I9feb973fa9387d4dbc3f3ef6352948d17a1aa5ee
Change-Id: I1ba2e44aa7411ef164095c9bec1f627f5626a859