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

Change-Id: Ia01d004c6bfaaa821b78a02033a788cfd82e9f97