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