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

Change-Id: I9fe0fb6e24922130b8e161cd9a332583883b8f02