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

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

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