Merge "Allow ContactsProvider to use compat change framework" am: 911df4f515 am: 36f5ca1920

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1894075

Change-Id: I55d1e0532cce2646a2a6839a4e43d4552311c592