Key{Master,Mint}: stricter parameter checking am: dcf02fd373

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

Change-Id: I1a82d1b901ea8f336517b08a303f0652b128d86b