Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_packages_apps_ContactsCommon into cm-11.0

(cherry picked from commit 1554081dac3334ccaae91b9bceebd831c01aa53f)