Merge "Handle ENITR failure for Headset control channel." into jb-dev