Merge branch 'cm-10.1' of https://github.com/CyanogenMod/android_frameworks_opt_telephony into cm-10.1