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

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

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