Merge "Expose TYPE_VPN_* constants" am: d2b8d781f8

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I02bdba628c0d1ef2dbf82dcc5b4f7f09a2ea7eb7