am edde2cc8: am e97172a1: am 92c9b658: Merge "Fix bug in conference call SRVCC." into mnc-dr-dev

* commit 'edde2cc8ea98fafc2f605595ae5befb4de2a71b3':
  Fix bug in conference call SRVCC.