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