Merge "Make Vpn more testable with a wrapper class" am: 2567308aff am: 3f78c80156 am: cd9326ed99 am: b90999df72 am: 6b8eededa7

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

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