Merge "Revert "[VCN01] Add NOT_VCN_MANAGED capability"" am: 805f4d7c22

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I03dade86df57e4728eea88ab9b148251a1097c85