[automerger skipped] ADD new enum NetworkType to identify multiple transport...

[automerger skipped] ADD new enum NetworkType to identify multiple transport type am: 1c8b9916 am: 704b463d -s ours am: 95d4efdb -s ours am: c88435d6 -s ours

am skip reason: Change-Id I0d106ca1631265b872386b59d542b206614f38ef with SHA-1 0bdce42a is in history

Change-Id: I3cc0255e81d05aeffaf0b05749b7aaf5e8d36fb9