Merge "CEC: 4-2-17 Feature Abort with correct reason" am: 793ae6e578 am: 17811a7310 am: fc90722f92

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

Change-Id: I1836fae0f5b49795dc8842e355dce92a1028c762