tree 8fd8137ec9b041d094f7259ceb4da3937fdfbbc0
parent 7c94df4903410aa2b889d85a977229c0859d1e5b
parent 123847466ea23336cc485cc09f8a233866d3f035
author Lorenzo Colitti <lorenzo@google.com> 1556166181 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1556166181 +0000

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