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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I50df306c83494af1d43d6df07347777348cd4c95