Merge 25Q1 (ab/BP1A.250305.020) to aosp-main-future

Bug: 385190204
Merged-In: I83796cca327b59896492d93b80e1e6ecf9224776
Change-Id: I7ea54f9f25d3fbcbf282213a697d4f31bbd05355