Merge "Update VpnTest for new restricted API" am: 2954e8af0f am: 69dbb598f9

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I76d0e305bbace9c41a1ca44bad660391bbe79297