Merge "Whitelist packages from VPN lockdown."
am: 5bc0c4f1ca

Change-Id: I329e24f1359a11a72ae9d0a23d2dc5b5de5aa8a7
tree: 90d767fc6999d271ab7cffafb157ec2f1f7eadbe
  1. core/
  2. services/
  3. tests/