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

* commit '951dcdd9404054f6b7e794b18aad6f50e44732f9':
  Adding a new hidden carrier API to mark GSM/CDMA networks as roaming/non-roaming.