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

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

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