Merge "Reinstate new VPN uid filtering unit tests"
am: 14ae90a4a6

Change-Id: Ib76c2cf319377141a374b3bdcf5e6606aaf9c06b
tree: 9ac957e6a7dc8baa2d760acf6ffd3fccfa72ea65
  1. core/
  2. services/
  3. tests/