[automerger skipped] Merge "[VCN21] Do not add NOT_VCN_MANAGED capability if...

[automerger skipped] Merge "[VCN21] Do not add NOT_VCN_MANAGED capability if specifier is present" into sc-dev am: 5e234568 am: 4a133d34 -s ours

am skip reason: Merged-In I98dd3f4652dc067eb5c4666e952db6c854bcbb10 with SHA-1 1b70bd18 is already in history

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

Change-Id: I5d5cee3870f8e40c7c77563548b21a8731082974