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

Bug: 385190204
Merged-In: I56913bfe9d3f35b88e034af72b373600a6115954
Change-Id: Ice6c024381a731c9a29c129d01bf3447ab4cd520