[automerger skipped] Merge "Whitelist packages from VPN lockdown: DPM API." am: c9d834e3f5 am: aade923534 -s ours
am: 845a1b7be9 -s ours
am skip reason: change_id I7508070f828fb7150df5d9e34846535d57c6a7c3 with SHA1 5cba336daf is in history

Change-Id: Ica8f85aa4e1a7cb47abd90233806fcb3eb1a458d