Merge "Add a config to show the Vpn options menu." into main am: 5abd3420 am: ccdd06e4

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



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