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