[automerger skipped] Merge "Fixing up reference impl to match new CDDL" am: 94247b356e am: d621d4f02b -s ours

am skip reason: Merged-In I31f352667e50d273bd1d545ee786ce8b09d4eb4d with SHA-1 dd136977b2 is already in history

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

Change-Id: Iaebb67153f3838030e4aaaee98dc6cf49a0b6c81