Merge "Renamed NetworkRegistrationState to NetworkRegistrationInfo" am: 91f335acbe
am: b514d240d2

Change-Id: I97f00e970f9bf9d148bdcbe82791178074dc8b02