Merge "Merge 25Q1 (ab/BP1A.250305.020) to AOSP main" into main am: c326c15754

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

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