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

Bug: 385190204
Merged-In: I5a091b06ec0692ab68abe99e67dd0434067aa28c
Change-Id: I54daf506e17313e03ad78e94e1679456abf66d01