Merge "Tidy up VPN code" am: 147ce8dbf9

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

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