Merge "Whitelist packages from VPN lockdown: DPM API."
am: c9d834e3f5

Change-Id: I5723a0970a0e37995c9db6e42ae527b8692bc48a