Merge "Deprecation of legacy VPN types no longer depends on the Provider Model Flag" into sc-v2-dev am: 2d529a4f5c am: e2dce3ffab

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16221118

Change-Id: I5fb7964a6c359175d5c5930e785f4020769030aa