Merge "Fixed vts tests cases which do not support factory attestation. Test:...

Merge "Fixed vts tests cases which do not support factory attestation. Test: Run keymint Vts tests." am: 0f7d4191 am: c1603e8e am: 07c1601d

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

Change-Id: I27812795afb51c66ebacc735b1986bd508c71cc4