Merge "Separate voice/data roaming state and type" into lmp-mr1-dev