Merge "Remove com.google.android.syncadapters.contacts from exception list"