[automerger skipped] Merge "Renamed NetworkRegistrationState to NetworkRegistrationInfo" am: 91f335acbe am: b514d240d2
am: f9062b4750 -s ours
am skip reason: change_id I730ce02739db1e102a710b45681bac887777a61f with SHA1 09c90af4da is in history

Change-Id: I990d625ac9877508bf1a7930d12f6c3d148b607f