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

Bug: 385190204
Merged-In: If19fa32ad0dd7f855808a407ca809358acd61442
Change-Id: I7a5db6984a7085379a39a6969dc2e1f6e42f747d