[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 SHA1 7bc3d98515 is in history

Change-Id: I712414cef0c25ecf1b6605b426bb2e8592fb941a
This commit is contained in:
Nathan Harold
2019-05-21 10:18:01 -07:00
committed by android-build-merger

Diff Content Not Available