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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9188685fe0bb5ee7dfe2c0538fea6644b2cd642e