[automerger skipped] Merge "Switch DDS during MSIM emergency call" into qt-dev am: fcc6df7c6d -s ours
am: 347156030d -s ours
am skip reason: change_id Ic49e126ae0abfe71edd1fe000c2a0dfd2360dece with SHA1 cb95725b71 is in history

Change-Id: I128f15ba27a8e00b171e6761aeb62f2de56799ea