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

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

Change-Id: I5d52b1cc825246e1a3a39d8a277aa02aa5c4b00c