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