Merge "Fix testLegacyLockdownVpn flaky" am: 58b8d1eb22

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

Change-Id: I7ab3a57e07a2e48dabb95dd6f671176727d58cdb
tree: 4825fb0a529bd787d4aa51fe71d824f60629afd0
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS
  7. TEST_MAPPING