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

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

Change-Id: Ie2b2f5386f30f1eb25cc3e42ee5a2b42655255f2