Merge changes from topic "niap-vpn" into qt-dev

* changes:
  Reinstate new VPN uid filtering unit tests
  Revert new tests and PackageManager mock
  Block incoming non-VPN packets to apps under fully-routed VPN

diff --cc tests/net/java/com/android/server/ConnectivityServiceTest.java
index 5f08a34,24952f9..16ec134
--- 1/tests/net/java/com/android/server/ConnectivityServiceTest.java
--- 2/tests/net/java/com/android/server/ConnectivityServiceTest.java
+++ b/tests/net/java/com/android/server/ConnectivityServiceTest.java
@@@ -262,9 -275,10 +276,11 @@@ public class ConnectivityServiceTest 
      @Mock IDnsResolver mMockDnsResolver;
      @Mock INetd mMockNetd;
      @Mock NetworkStackClient mNetworkStack;
+     @Mock PackageManager mPackageManager;
+     @Mock UserManager mUserManager;
  
 -    private ArgumentCaptor<String[]> mStringArrayCaptor = ArgumentCaptor.forClass(String[].class);
 +    private ArgumentCaptor<ResolverParamsParcel> mResolverParamsParcelCaptor =
 +            ArgumentCaptor.forClass(ResolverParamsParcel.class);
  
      // This class exists to test bindProcessToNetwork and getBoundNetworkForProcess. These methods
      // do not go through ConnectivityService but talk to netd directly, so they don't automatically