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

Bug: 385190204
Merged-In: Ibf5b40a60cf52966cf0927e939f953eae22a9a26
Change-Id: Ia01093d17fafa05fe6ea8721f90457de52dbfc87