Merge "Merge 25Q1 (ab/BP1A.250305.020) to AOSP main" into main am: 2c15eda775 am: 5ffa51103d

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/3530923

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