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

(cherry picked from commit fc2816899c5220dbeaae1261da9b2cef84849c55)