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

(cherry picked from commit 1947c86d7b4520984a68f165fff4ad710e547689)