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

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



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