tree d6596635c757ec5348a061a68c2ca6e2b1dbfe5e
parent df390e2e8be8f92ee1ff7d7594a00a8627617596
parent a68e7486015c173378ec44d203547b63b1f0c66f
author Remi NGUYEN VAN <reminv@google.com> 1614309723 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614309723 +0000

Merge "Add public alternative for protectFromVpn" am: a68e748601

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605094

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I759af534bdf50f647351056275857c056998bf14