Merge "disconnect or ignore onAnswer/onSetAnswer CCCs that are rejected" into udc-dev