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

Change-Id: I2a21387c6740eff5ef08ea14abbf484be25b8928