am 4bd4f117: am 8bdab501: Merge "Adding a new hidden carrier API to mark GSM/CDMA networks as roaming/non-roaming." into lmp-mr1-dev automerge: d39d19d

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