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

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

Change-Id: I81dbb61dd536bb059d6560e624b2e660c4035989