Merge "Whitelist packages from VPN lockdown."
am: efc773525c

Change-Id: I329e24f1359a11a72ae9d0a23d2dc5b5de5aa8a7