Revert "Merge tag 'android-6.0.1_r22' of...

Revert "Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/packages/apps/Contacts into cm-13.0"

This reverts commit 3c1aaac1, reversing
changes made to cd5f6711.

Change-Id: I69612db3197cf06c8884a095bd4a4a5a946318f0