Merge "Revert "Use the SubId in the TM.getNetworkType if Valid"" into qt-dev
am: f413c1e833

Change-Id: I2fa5de3e940d4496c25d3b5064ff784f143e2986