Merge "Slightly cleanup KeyParameter error handling." am: 5de2d3086d

Original change: https://android-review.googlesource.com/c/platform/system/security/+/1418720

Change-Id: Ic0a818e2de30e058a922856a77f3e36fa820a769