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

Bug: 385190204
Merged-In: I0d18dcdde0618045b779748dce6b67ce48791d0d
Change-Id: Ib45422999cc03f34fc08fe45edb5b0a93b96e858