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

Bug: 385190204
Merged-In: I6cf972a93e3d4b213e1c76e8b2a0211e6636e8be
Change-Id: I7cf5e9eabfeb1a8efa7d5aef03842c4a4f632b1b