Merge 25Q1 (ab/BP1A.250305.020) to AOSP main am: 097cc4d107 am: 9adf0069ae

Original change: https://android-review.googlesource.com/c/platform/tools/treble/+/3516266

Change-Id: I6117d0b7c6a02327d7875b062206d452d6b7fb1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>