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

Bug: 385190204
Merged-In: Ieee233c0c2c9ac36c16cc3803d0937a4cf9bfb13
Change-Id: I278acb6048e2c5f70cc9584d0ec08cb6698d3809