Merge "Add SdnProvider to AOSP Contacts app" am: d723f4f0e9 am: ffad3be5ae am: 04cbffab6e

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

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