Merge "Revert "Revise KeymasterMessage versioning system"" am: afba455c8c am: 9a3a8bf058

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I69345935431a687c36d80837fd6399109fd4da2a