[automerger skipped] Merge 25Q1 (ab/BP1A.250305.020) to aosp-main-future am: 1b4c94f149 -s ours

am skip reason: Merged-In I686066d2cb99b7ab6cf8b05e3beebb51e0900d36 with SHA-1 6c24742b74 is already in history

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

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