Merge "Fix testLegacyLockdownVpn flaky" am: 58b8d1eb22 am: b08d1c3095

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

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