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

Bug: 385190204
Merged-In: I97f7d13d286c41915cc2561276176505ad7ceb0f
Change-Id: Iac8fdabeffa3a19c8e6eb63c33ec3e8428fd587f