Merge "Fix testLegacyLockdownVpn flaky" am: 7151f51c5a am: e965720924

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

Change-Id: If5e7a4038b58b3beb52c517cfa1208cf08fcac2a