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

Bug: 385190204
Merged-In: I2731c7eb01e8998345ca9877c35369676e8de8a7
Change-Id: I0f70a4dd81be9bb31736be959f82e5692a3d28b4