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

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

Change-Id: I8248b79e85f2c885596e25e7c93d61e3fbeb7d91