[automerger skipped] Key{Master,Mint}: stricter parameter checking am: dcf02fd373 -s ours

am skip reason: Merged-In I77bcc13cbf096a531d13f85a94d19a16cb812a43 with SHA-1 b90937dff7 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/keymaster/+/14646910

Change-Id: Ibd99c7039570c0e83806ea7cc91137f9ea2775f1