[automerger skipped] Merge "Merge 25Q1 (ab/BP1A.250305.020) to AOSP main" into main am: c326c15754 am: 03315e71fa -s ours

am skip reason: Merged-In Ie63be8aa77c1500e20e0165ca867c40b929539b1 with SHA-1 81fe7d28b4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Contacts/+/31418773

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