[automerger skipped] Use the SubId in the TM.getNetworkType if Valid am: f36fee3c
am: 7fae515a -s ours
am skip reason: change_id Ice4f673750ab3b374644750113e5b9b2a4f5ba63 with SHA1 0aca4313 is in history
Change-Id: I4ed2c5f09cb241e83df485950d35dce1912a5e61