Merge "Add new NetworkType for WIFI+CELLULAR+VPN transport" am: abc516b9f9 am: 6ae6d9d125

Change-Id: I27fe1964043627e9de5251931b2bf0cc0cb01ef0