Merge "refactor data/voice roaming states" am: 285201d0b3
am: 1d4dab0a7d

Change-Id: If74d1fe70e51b59b24b0441dc0e7c4fbbcebfd0c