Merge "Fixing up reference impl to match new CDDL" into sc-dev am: 4b9298ab3f

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

Change-Id: Id1311899f4a9680cf000446642e186321961333b