[automerger skipped] Merge "Renamed NetworkRegistrationState to NetworkRegistrationInfo" am: a4ddd3b3 am: 4edff817
am: d75761e4 -s ours
am skip reason: change_id Ia6f7a7029a3cfe325db9c2c30eabdbe94e196d4e with SHA1 970c03f4 is in history
Change-Id: I3bc0bb931566bec1b081732d6bfb176fe676a6cd