Merge "Add a config to show the Vpn options menu." into main am: 5abd3420c4 am: 16e99c187f am: 16677a5492

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

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