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

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