am 15470bf5: Merge "Fix for call timer resetting when starting IMS conference...
am 15470bf5: Merge "Fix for call timer resetting when starting IMS conference call. 2/4" into lmp-mr1-dev
* commit '15470bf5':
Fix for call timer resetting when starting IMS conference call. 2/4