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

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

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



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