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

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

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