Merge "Key{Master,Mint}: stricter parameter checking" am: 4d2dbc8705

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

Change-Id: Ib7db7fa7216406a0bc9f099aea3d9c3f3a046911