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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic0fd366c8ae249072d32fafc6d70e4dc995ad7ae