Merge "keystone2: Fix check of i2d_re_X509_tbs call" am: a0a2d5da84

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

Change-Id: Ic98a72152e2b38d8862ba913cf656e9c4fe91c6c