Merge "Revert "Block incoming non-VPN packets to apps under fully-routed VPN"" am: 6617bf81c9
am: 9fb6898f47

Change-Id: I3e1c408fcfc14db8b2586a79416233ffe9e1173d