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

* commit '647b437d0772a8c73ac3936b2f8e69d4bd1953d3':
  Separate voice/data roaming state and type