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

(cherry picked from commit e1e16fa91b943ae49e10dab393194ce357a30c73)