Merge "Convert KeyParameter to wire type." am: 29c9edd2d5

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

Change-Id: Ic80ba5f9d6a51c2c0af48dd6d8543f404d6ad767