Add keys to handle GSM and CDMA roaming/non roaming overrides

bug: 20828356

Change-Id: Icb5ad25e213771554915bd9479a4a66b4f4a6906
3 files changed