[automerger skipped] Merge "Switch DDS during MSIM emergency call" into qt-dev am: fcc6df7c6d -s ours am: 347156030d -s ours
am:b5d8547d0f-s ours am skip reason: change_id Ic49e126ae0abfe71edd1fe000c2a0dfd2360dece with SHA1cb95725b71is in history Change-Id: Id5bfd08c74720db0f69c54d5ed91cf6b2e56244f
This commit is contained in: