Merge "new SystemAPI for roamingType in NetworkRegistrationState" am: 24df195e78 am: 0c9e00dd03
am: 29f4070ffd

Change-Id: I7532464329575f2eed3127aa9e44c02bd8777557