[automerger skipped] Merge "Reland: Add attribution tags for VCN and VPN" am:...

[automerger skipped] Merge "Reland: Add attribution tags for VCN and VPN" am: 10ea3b2c am: 2c813ef7 am: e8b0a167 -s ours am: f471b6ab -s ours am: 2581fc3e -s ours

am skip reason: Merged-In I8b326de0484f9c97eb1b12f27a792c5ebf35ba1e with SHA-1 310ac5b1 is already in history

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



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