[automerger skipped] Merge "KeyMint VTS: re-order auth failure arms" into...

[automerger skipped] Merge "KeyMint VTS: re-order auth failure arms" into stage-aosp-udc-ts-dev am: 34133888 am: 14cd9779 -s ours am: b08fa902 -s ours am: ffd6c9ba -s ours am: 2f2ed157 -s ours

am skip reason: Merged-In Ie450d9969c337d5274502f3600e14c0b481e8b34 with SHA-1 a35699cb is already in history

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



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