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

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

Change-Id: If8e904bb320b91bb35d2366cbc58ddd107cf7b9f