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

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

Change-Id: I9f62e67c9ae27fc1effa831cc6bc47c0975e278d