[automerger skipped] Merge "Add NET_CAPABILITY_NOT_VCN_MANAGED to ConstantsShim." am: 01cd6430 am: 4a497f8d -s ours am: fb0f3056 -s ours

am skip reason: Change-Id I941024a1661a66794e97e8f2b0e992f83f673bf4 with SHA-1 e2edb34f is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib20b8c4940e108055d6b33ccdb4661fe40b01022