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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I051a51e5ee5898784d3a126140536ddeec6a0ba6