[automerger skipped] Merge "Fixing tests to reflect change in CDDL" am: 6f87175e am: a46936bb -s ours am: 2cb81f37 -s ours

am skip reason: Merged-In Ibdcf242e0ae73dee1a08fe98d939130055e4492e with SHA-1 f884283c is already in history

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

Change-Id: I7ece985c253d94f95eba394868dbef291ea15852