Merge "Expose TYPE_VPN_* constants" am: d2b8d781f8 am: 1fd78110a4 am: 9c617a1829

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic2cab78f0920e5805c27b14bef10417d6e018e94