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