[automerger skipped] Make MockVpn more realistic and easier to use. am: f3d35fdeaa am: 635e063857 -s ours

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

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

Change-Id: Ie847fa29d101d3c248c091bbeab6b1d30178a2d5