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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I665f4685621514c039e87893f26fd23e3e045baf