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

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