am 83c0b096: am 98f81182: am 647b437d: Merge "Separate voice/data roaming state and type" into lmp-mr1-dev

* commit '83c0b096b775e7b39f89c2da1c9a8193555c0178':
  Separate voice/data roaming state and type