Merge "Reinstate new VPN uid filtering unit tests"
am: 554a15d5ea

Change-Id: Ib76c2cf319377141a374b3bdcf5e6606aaf9c06b