am d7116ff1: Merge "Do not suppress error feedback during a SIP call." into gingerbread

* commit 'd7116ff1f0d1a3c14992273d0b899c3b71ba6d3f':
  Do not suppress error feedback during a SIP call.