Merge "[automerger skipped] Merge "Renamed NetworkRegistrationState to NetworkRegistrationInfo" am: 936c536bba am: 55e73c27a8 am: dc025370cd -s ours am skip reason: change_id I8af36b388182ab08257b64c37078f156d4821709 with SHA1 e27d3fde88 is in history"