Merge "Updating CDDL schemas to match the finalized spec." am: 11854c2d82 am: b8cf151c98

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

Change-Id: I45e601192b1f05c794dea2cf61fa2668942a32a5