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

Change-Id: Iae5a5e135d7a469b55cb7167ee6582e95c919908