Merge "Add public alternative for protectFromVpn" am: 0c04e41e7b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I759af534bdf50f647351056275857c056998bf14
tree: c22955210d6130b6efc6cd06885f056f42cad4b5
  1. framework/
  2. service/
  3. OWNERS