tree fe7bddc0a77a0c4b5334bb9079a5ee3ae7ae7077
parent b9f55143bc8e26bdeb2d8c877dfea1c42edbc17d
parent 2b996ad0dd0720d8a40bd1ce9f4c205c371bef13
author Pavel Grafov <pgrafov@google.com> 1548742404 -0800
committer android-build-merger <android-build-merger@google.com> 1548742404 -0800

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

Change-Id: Ice1f8f27da3d0092af58c8e93969575ba9f8f925