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

Bug: 385190204
Merged-In: Ie202634b67fbfaca510ec0087b071f26256ec35f
Change-Id: I7c1d8bad6c85c89b16231cd4b970585d3bcbdaee