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

Change-Id: I188a31f6b5f22c73c6892e30972c5a0d06f82ed1