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

Bug: 385190204
Merged-In: I8bee8f5d52aed97bde677fd4cfc2d7b962e55583
Change-Id: I21dfac9bd12620447ff71714adef4a911b8816d1