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

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

Change-Id: I0644a03ed6d89efa890f850d0372a38723642699