Merge "Revert "Whitelist packages from VPN lockdown.""
am: 9f73671651

Change-Id: Ibaf799dc2664a6b3b743030da956679a3414ad9d