Merge "Don't call ERR_error_string in keymaster" am: 13591647b0

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

Change-Id: I098a3789a017219f6f1b02a1949fcdde7618544b