Merge "Use the SubId in the TM.getNetworkType if Valid" am: 06445094a9
am: 3c42bbd867

Change-Id: I9c361ba4afc80c70051e3382b7a5e2aab7a9071a