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

Bug: 385190204
Merged-In: I238bdd1dd11202bbb446a141e6a27371155c8dc4
Change-Id: Ie9c272d4ba12f9afbed6f77a63587b561ac25e70