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

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

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