Merge "Generalize RKP CDDL schema beyond CSRs" am: ff8f1d6edd am: f1a540f05a

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

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