[automerger skipped] Merge "Set legacy type for VPN" into sc-dev am: e1b6e11c am: cdd03d6d -s ours

am skip reason: Merged-In I237f7ff4d6899530c4ad057a84d3b8b34513be79 with SHA-1 d1de5bd3 is already in history

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

Change-Id: I478aac115acb4082f76f39bbd8a97d5d1134a5c1