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

Change-Id: Iabab15d42ce0af2cbe7f6a9eec0bee52c7a238d6