[automerger skipped] Use NET_CAPABILITY_NOT_VCN_MANAGED from ConstantsShim. am: 589d0ad195 am: 894c6ff74a -s ours am: f5716d15a1 -s ours

am skip reason: Change-Id If40ebfadbf6d3ee86a58a55711fbc146a8599fdb with SHA-1 7246474dfd is in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1611315

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3fd493a8a6d65c637616550b3c9465916cf3be47
tree: 80812865b3032c8cd136be6c1acb11e5d1c6d34b
  1. tests/
  2. Tethering/
  3. .gitignore
  4. OWNERS
  5. PREUPLOAD.cfg
  6. TEST_MAPPING