[automerger skipped] Use NET_CAPABILITY_NOT_VCN_MANAGED from ConstantsShim. am: 589d0ad195 am: 894c6ff74a am: c715bf96b9 -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: I2f15c603768471826d332df6bbdbea6c11f6c9cf