Merge "Add version and impl info field to EncryptedKey" am: 0b18dcb337

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

Change-Id: I3a594c65f9084bb6645d01292f8fce7454ba7f94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>