Clean up keystore owners am: 927def5d7c am: f002122aed

Original change: https://android-review.googlesource.com/c/platform/external/wycheproof/+/3315490

Change-Id: I0872afeff62c594dfa2e22c196f2f4deeec3afd7
Signed-off-by: Automerger Merge Worker <[email protected]>