[automerger skipped] Merge "Whitelist packages from VPN lockdown." am: efc773525c am: 295016b22b
am: 52e0e403d2 -s ours
am skip reason: change_id I7f6c5b9172063b588feacd6b9930a6cb88f764ab with SHA1 1d58621a1f is in history

Change-Id: I56f2eadd2e95a74897d7e17cb21d672e747b8261