[automerger skipped] Merge "Revert "Use the SubId in the TM.getNetworkType if Valid"" into qt-dev
am:f413c1e833-s ours am skip reason: change_id I9a974018d4155426b1050a4b80b82f4bf4a9d996 with SHA17bc3d98515is in history Change-Id: I712414cef0c25ecf1b6605b426bb2e8592fb941a
This commit is contained in: