Merge "Merge "Reworked getNetworkRegistrationStates API" am: f2e9856f49 am: 2835cb7d87" into pi-dev-plus-aosp