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

Bug: 385190204
Merged-In: I97af0caebf0bbc5bd9642deb10411080f23f82e6
Change-Id: I0c103da535304fc1faf1b61a83b7b7aff9f613c4