Merge changes I4f181789,Ia8a0c99b

* changes:
  Revert new tests and PackageManager mock
  Revert "Revert "Block incoming non-VPN packets to apps under fully-routed VPN""
tree: 580fb55314e40093a2335b8845a2e0b2ebb155b2
  1. core/
  2. services/
  3. tests/