[automerger skipped] ADD new enum NetworkType to identify multiple transport...
[automerger skipped] ADD new enum NetworkType to identify multiple transport type in am: 9aec8977 am: c6e3232b -s ours
am skip reason: Change-Id I24ceff6bc95af79d92d3e39695b24d10763cdb4e with SHA-1 4089f1fd is in history
Change-Id: I16250ac458e682c783a6e7deb0cf28f32d9e5a93