Merge "Update the message versioning system." am: 164ff886a3 am: 4903c36231

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I489bdee1fa8b3cb92a247a65b8896a531e093c2c