am d87c32aa: am ff636d38: Merge "CEC: Don\'t send <Feature Abort> on the short message" into lmp-mr1-dev

* commit 'd87c32aa859ef54c6bce923c52725edf44538488':
  CEC: Don't send <Feature Abort> on the short message