Merge "Revise KeymasterMessage versioning system" am: 81a4e266d6

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie2b6775c735452af0120a877d19c2d1ec187750f