Merge branch 'kk4.4' of https://github.com/SlimRoms/frameworks_opt_telephony into kk4.4