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

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

Change-Id: I374efeaf17fe27c8eeeb9858b8e0d876c8f2f484