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

* commit '98f81182fb61953e0712bd788941710b6ad842c2':
  Separate voice/data roaming state and type