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

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



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