Merge "Whitelist packages from VPN lockdown: DPM API." into pi-dev-plus-aosp
am: 299f825678

Change-Id: I3deb4a865e109e2b2e67dc7d8ffc775747f34303