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

Bug: 385190204
Merged-In: Id527ec4b78113d6412aeab139d24786f495d2d0a
Change-Id: I920321eafefa9ffcbd163ef7a97b6b912e8cf171