[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 -s ours
am skip reason: Change-Id I407ac1d0dcaec0aeb6581df614ffd3b0d03385b9 with SHA-1 c78c31a8 is in history
Change-Id: I4dcb39a2d0c96407a2d1e39b5a22af90ee5f5383