Merge "Make MockVpn more realistic and easier to use." am: e191d8d958 am: b1296e900d

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

Change-Id: I96385c6463b791920199fd008743cddeaae6d348