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

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

Change-Id: I8f20f22397c29d9b11a0a7c1a17ef4f811ec8f89