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

Change-Id: I48c22565935d444c95bb0246d5c01c34d9e18431