Merge "Allow ContactsProvider to use compat change framework"