Merge "Make TYPE_VPN_LEGACY no longer deprecated." am: 590949fd61 am: 9d5240865f

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

Change-Id: I8d483487a84d11670425326dcf278ae131b553d6