Merge "Adding a new hidden carrier API to mark GSM/CDMA networks as...
Merge "Adding a new hidden carrier API to mark GSM/CDMA networks as roaming/non-roaming." into lmp-mr1-dev
automerge: 951dcdd9
* commit '951dcdd9':
Adding a new hidden carrier API to mark GSM/CDMA networks as roaming/non-roaming.