[automerger skipped] Make MockVpn more realistic and easier to use. am: 02e6be7824 am: 753242551f -s ours

am skip reason: skip tag Change-Id I749ff325bc13ac96f512270b86d1f67686eec378 with SHA-1 6d8b1d2846 is already in history

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

Change-Id: Ie847fa29d101d3c248c091bbeab6b1d30178a2d5
tree: a5eb007f22875a587b8ffd1f8b9b7ac3a5f04725
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS