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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1c71db66d9276ea83bb63fbcedf0c924d6acd3a7