Merge "Revise KeymasterMessage versioning system" am: 81a4e266d6 am: 46d5f50e99 am: 6c309983cb

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia9c77f1092271dcc29b1f83a634794e4f014fdbd