Merge changes from topic "vts_cec_10" am: 293d67a425 am: 2a8959d969

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

Change-Id: I6040f7e89be7dac8fe998f189f35d37883c289f3