Merge "Fixing tests to reflect change in CDDL" into sc-dev am: 09c9ab7c9a am: 995bbe52a3

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

Change-Id: Id75b609f19966255d39a16797c5aedc3838e7982