[automerger skipped] Merge 10952656 am: 335fc61e44 -s ours

am skip reason: Merged-In If15d6485f5cacc1de0786089dba660ca6f9a4e16 with SHA-1 74ea1b8ca3 is already in history

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

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