Merge "Update VpnTest for new restricted API" am: 20507cf1f9 am: 1fb754cc9c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I76d0e305bbace9c41a1ca44bad660391bbe79297
tree: 682636d3676f435a41c787a6b76f6e8c3f9a5925
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS