Merge "Reworked getNetworkRegistrationStates API" am: f2e9856f49
am: 2835cb7d87

Change-Id: I7a8c2da66c028f9570c36bca676a85ef4ac602fb