Merge "IMS call merge call-back changes." into lmp-mr1-dev
automerge: cf96936

* commit 'cf96936966ae9506ce4151bf5bee276b5c7ea96b':
  IMS call merge call-back changes.