Merge "Removing authority key identifier OID extension" am: e2900afdbb

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

Change-Id: I2c1d15d5643b1c546b5ae48b3229ec8534ef6c5d