Merge "Reworked getNetworkRegistrationStates API"
am: f2e9856f49

Change-Id: I141a77202a00322ae38e7544d02d5702cf7e6457