[automerger skipped] Merge "Modify constructor of NetworkRegistrationState" am: 61c09d128b am: 070ab3d85e
am: cd9df483d4  -s ours

Change-Id: I9abe56e46dd5f11c23efa3037af8a0192cc3589c