Merge "Make Vpn more testable with a wrapper class" am: 2567308a am: 3f78c801

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



Change-Id: I7a238c54fa7a0e96e710d8c1c424e3edc0180997
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>