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

[automerger skipped] Merge "RESTRICT AUTOMERGE Implement advanced vpn ui in vpn settings" into tm-qpr-dev am: f38e8e61 am: 92e7da84 -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: Ia804ea786ff69d3e4aca6244df33d5cf5ecfd8cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>