am 839734bb: Merge "Handle ENITR failure for Headset control channel." into jb-dev

* commit '839734bbe502c876237a0473823b606803051825':
  Handle ENITR failure for Headset control channel.