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

Change-Id: I5d8298f0fec6f06d7a45502eaf62b3984b856420