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

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

Change-Id: I9ba64b458e2dee813afd57cae0fcc3c4420b78e6