[automerger skipped] RESTRICT AUTOMERGE Implement advanced vpn ui in vpn...

[automerger skipped] RESTRICT AUTOMERGE Implement advanced vpn ui in vpn settings am: 858e6ff3 am: 95d2add6 -s ours

am skip reason: subject contains skip directive

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



Change-Id: Id0f7e8c9f724b5b814f15e47b3ba8f58f1bd6947
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>