tree d76226d2c7265b566d39d5d253ca12c5b5a33c1b
parent 3b7f437db829e1e95a388662fe9f5a51d260a683
parent f58254455127173b156ec27cc3cb54f3af2c033e
author Cassie Wang <cassiewang@google.com> 1698044550 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1698044550 +0000

Merge "Add a config to show the Vpn options menu." into main am: 5abd3420c4 am: ccdd06e496 am: f582544551

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

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