Merge "Add SdnProvider to AOSP Contacts app"