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

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

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



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