Merge "Add VPN name into the extra info of NetworkInfo" into main am: 9808272841

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

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