Merge "HDMICEC: Add Switch as an allowed device type" am: 17008225a9 am: 2747de0471 am: 882762db8e

Original change: https://android-review.googlesource.com/c/platform/cts/+/1676948

Change-Id: I29da8a7f2de0afa0e72ef90463994930c98bfd18