Merge "Add CtsVcnTestCases to sim-include tests" am: cc5fa77934 am: f655ad3b6c am: 49199ee476

Original change: https://android-review.googlesource.com/c/platform/cts/+/1600613

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9d4fca020520fd17dfe1a0300a889e0eb3ac3c80