Merge "Renamed NetworkRegistrationState to NetworkRegistrationInfo" am: 936c536bba
am: 55e73c27a8

Change-Id: I84a8dcfbfad1e9d2b8b342f1f4cce9d8c9a4c69d