Merge "Use AlertDialog to alert Unsupported VPN type." into main am: 643136bba6
am: 6262b3b67b
am: 9481ee51f6
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2824760 Change-Id: Idb05db35538f26f14d3bae128115958279ae7ea4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: