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

Bug: 385190204
Merged-In: I3eeb60faa894c06c291ff9bc502d451522b15ee2
Change-Id: I3c45bdbaee1c74e28a67800d50349ad308281bc4