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

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

Change-Id: I344b95a76f93b8b06b65263e400ed12eaf95afcd