Merge "Add new NetworkType for WIFI+CELLULAR+VPN transport" am: abc516b9 am: 6ae6d9d1 am: 1bee9993 Change-Id: I35c23484dfa9beb8ff277743d36aa9571f212054