Merge "Revert^2 "Revise KeymasterMessage versioning system"" am: 435f35afaa

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I91c737ec516866511a8db52568cd286c84874990