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

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

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