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: a739b851 am: bb57d2ec am: 19d01a1a

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



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