Merge "Add dump for Vpn" am: ee9ad341 am: c0c01517 am: b15e857a

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



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