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

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

Change-Id: Icaa6356cf0c5a6353f2e627fae165b1abdeea6fa