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

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

Change-Id: Ic2b9a0d2a394b20e76168cf00bb98d0fe8cf06b0