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

Bug: 385190204
Merged-In: Ic21d81a0de15621d60001962f30fbcf8d59decdf
Change-Id: I63108289ffcc4d5527b3935af196d377f24150e3