Merge "Revert "Telephony: Add data rat constant"" into cm-11.0