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

(cherry picked from commit 7c983612c637c0236cd73e92c5c233250a82f1b4)