Merge changes from topic "cf-message-versioning" am: 01f31fc5ce

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

Change-Id: I0b235dcbdfb74184a38b7bb5b7d6bc398226bcf0