Merge "Fixing up reference impl to match new CDDL" am: 94247b356e

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

Change-Id: Ic3e4573f79ebc511d22f7a1586b66861ded294dc