Merge "Fixed vts tests cases which do not support factory attestation. Test: Run keymint Vts tests." am: 0f7d419136 am: c1603e8ef5

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

Change-Id: I5abe99967badaa7bea30797b6e7903097d55bf62