[automerger skipped] Add new NetworkType for WIFI+CELLULAR+VPN transport am: 1e3dffd334 am: 8e73c91774 am: 614a9ce931 am: 1b0b33aae1 -s ours am: db9934eaf4 -s ours
am skip reason: Change-Id I1d43633705b69bf0111386630b2eebf394cb9366 with SHA-1 c459e133f2 is in history
Change-Id: I4f2043450bc83be15e9b07e4b2852a82e4c177db
This commit is contained in: