Merge "Whitelist packages from VPN lockdown."
am: 76e3e0052c

Change-Id: I3332e495ba0c903dff3dbb9c53c5c4784ea519f4
tree: 40566afee1049846321db885efccf05f346985a0
  1. core/
  2. services/
  3. tests/