Merge "rkp: pull out remaining CDDL and make compliant" into main am: 05f682fd3d am: 46b80f12da am: eafa23b52c am: 1407a5dd19 am: b03d2d9155

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2745396

Change-Id: I5de8995cdf70042a57e299d62f6b63164d77dbe0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>