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

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

Change-Id: I6f5e94033040449f76a8ec30f82ff3dfb52280f6