Merge "Reland: Add attribution tags for VCN and VPN" into udc-dev am: 67c8f87d am: a739b851

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



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