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

Change-Id: I1e5ee66c856296651638b56615cf07e515edcd96