Merge "Fixing tests to reflect change in CDDL" into sc-dev am: 09c9ab7c am: 4c756697 am: 7c6dbf80

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

Change-Id: Ia4c8c2b2ffd7e518b1c05fddd2e809d0ae6e0a84