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

Bug: 385190204
Merged-In: I02624d2b431b630a1c02864738df8be546c3b4ea
Change-Id: I11b623d99844b053f6b8615df59153ae107be757