Merge "Minor cleanups in VPN" am: 949e7c26 am: 0c7aea93 am: c216a9f4

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



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