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

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

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