tree 07b95b05e5ccb63d3e4f108444f65c69497b84db
parent 658db85cd0dcc4bda3eb997464bd7b0066ef206f
parent 52e0e403d2f4aa250ae166ae9a33000fbb63f662
author Pavel Grafov <pgrafov@google.com> 1548356458 -0800
committer android-build-merger <android-build-merger@google.com> 1548356458 -0800

[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