Merge "Fix testLegacyLockdownVpn flaky" am: 58b8d1eb22

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1659998

Change-Id: I7ab3a57e07a2e48dabb95dd6f671176727d58cdb