Merge "Renamed get network registration states API" am: 2966539634 am: 70015f07b9
am: 0ab35f0ffc

Change-Id: If81b411d72f69cf6e1381fb1a0ecf1e84fd05aec