Merge "Revert "Use the SubId in the TM.getNetworkType if Valid""
am: b846e3c100

Change-Id: I2e5d60838b7b65acef16efdaab307e267c0a2888