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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icee63b017e27a1da4016225f57d08fb48ac9842f