[automerger skipped] Fixed vts tests cases which do not support factory...

[automerger skipped] Fixed vts tests cases which do not support factory attestation. am: 7e1dd8a3 am: abfb309c -s ours am: 24252319 -s ours am: ac00fabe -s ours am: 86ef9b76 -s ours

am skip reason: Merged-In I8055fef8df5ec77e317f810f9b95a53311b23cf0 with SHA-1 0564249f is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2963907



Change-Id: I0416cec901094371ce007d2e13cacda47ecc958a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>