[automerger skipped] Add new NetworkType for WIFI+CELLULAR+VPN transport am:...
[automerger skipped] Add new NetworkType for WIFI+CELLULAR+VPN transport am: 3d16baf2 am: 02006cf5 am: 5953e308 am: 61ed8876 -s ours
am skip reason: Change-Id I407ac1d0dcaec0aeb6581df614ffd3b0d03385b9 with SHA-1 c78c31a8 is in history
Change-Id: I23a1d0137f09de50ff180cc0e5c68f56a0b8b36c