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

Change-Id: I906593c9f1eeb320adccefc6040feedff88a2cd2