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

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

Change-Id: I8768bb082094d4062491becc4232ae35907dfc49