Merge "Renamed NetworkRegistrationState to NetworkRegistrationInfo"
am: 91f335acbe

Change-Id: I97d444272c6e88a8cfc1fa7a0059da349c9921e7