Merge "KeyMint VTS: re-order auth failure arms" into main am: 2ef3749cba am: e865448a4e am: a88395ee44 am: ee4bcc968c am: 090155dcc2

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

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