Merge "Whitelist packages from VPN lockdown."
am: 774c3ce152

Change-Id: I3332e495ba0c903dff3dbb9c53c5c4784ea519f4