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

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