[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:a981ef6c6c-s ours am skip reason: change_id I9a974018d4155426b1050a4b80b82f4bf4a9d996 with SHA17bc3d98515is in history Change-Id: I277f5462e211a7a7afceaa9adca3e3641f93dd91
This commit is contained in: