[automerger skipped] Add new NetworkType for WIFI+CELLULAR+VPN transport am:...
[automerger skipped] Add new NetworkType for WIFI+CELLULAR+VPN transport am: 1e3dffd3 am: 8e73c917 -s ours
am skip reason: Change-Id I1d43633705b69bf0111386630b2eebf394cb9366 with SHA-1 c459e133 is in history
Change-Id: Iac5c9db7a7a806830adcf3cd22df138db591a9e8