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

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

Change-Id: I47be4ae848866005787ae518a7bb6efc942aa0c1