Merge "Reinstate new VPN uid filtering unit tests"