[automerger skipped] Use the SubId in the TM.getNetworkType if Valid
am: f36fee3cf7 -s ours
am skip reason: change_id Ice4f673750ab3b374644750113e5b9b2a4f5ba63 with SHA1 0aca431313 is in history

Change-Id: I88de75bde31a644ace9d727eceaf9c764bf689a0