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

Change-Id: I601649e15c97a8fd1732c4d38dab9d5556c5f175