Merge "refactor data/voice roaming states" am: 6bd29ab2df am: 652ec06948
am: 6169b04385

Change-Id: I921e3dd8f4c82d83d1f12657813945fbcc2e21b2