Merge "KeyMint VTS: re-order auth failure arms" into stage-aosp-udc-ts-dev am: 3413388821 am: 14cd97799f

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

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