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

Bug: 385190204
Merged-In: I31c67a3c5afcdfd4b2ea7bf6a1126764870f798f
Change-Id: I8df8f82491a21e461a2f9ee78953757fd03a7c9a