Merge "Add NetworkRegistrationState into SS's list." am: 9f92ed943c
am: 6576ed3d5b

Change-Id: I02efc2c7dceb775a5ce2eb3e3f2696e098cef046