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

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

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