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

Original change: https://android-review.googlesource.com/c/platform/external/setupcompat/+/3531905

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