Merge "Set legacy type for VPN" am: e19a7da47f

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

Change-Id: I30a234ade5efe99fb5ba7b5b916a1de9920bdbab