[automerger skipped] Merge "Revert "Use the SubId in the TM.getNetworkType if Valid"" into qt-dev am: f413c1e833 -s ours
am: bc7e8b1932 -s ours
am skip reason: change_id I9a974018d4155426b1050a4b80b82f4bf4a9d996 with SHA1 7bc3d98515 is in history

Change-Id: I1c629cd316e01f4c700491ab331ad65d5a743e7f