Merge "new SystemAPI for roamingType in NetworkRegistrationState"
am: 24df195e78

Change-Id: Ic21830831a4a528b250c89e1b2cd63f45f4373c6