[automerger skipped] Simplify MockVpn. am: 4b615c01e5 am: 03cff31e16 -s ours

am skip reason: skip tag Change-Id I49421183538ba61ca790af71e309ece36b653bf9 with SHA-1 bc3211dd81 is already in history

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

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