Merge branch 'qcril' of git://github.com/CyanogenMod/android_frameworks_opt_telephony into cm-11.0

Change-Id: I9782c37f5fe5e4f6e32bda701d9e229020bf77d1