Merge "NWRegState.getAccessNetworkTechnology in sync with SS.getNetworkType"
am: 6730f34590

Change-Id: I9cf78f908878afa8c313d7675be351d0aa96f73b