[automerger skipped] Simplify MockVpn. am: 7c4ae16b94 am: 401dd1cfd4 -s ours
am skip reason: skip tag Change-Id I49421183538ba61ca790af71e309ece36b653bf9 with SHA-1 9ededd8476 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425310
Change-Id: I61d9213a4448374d899d8cd350cfaf3063e0b8be
This commit is contained in: