Merge "[automerger skipped] Merge "Switch DDS during MSIM emergency call" into qt-dev am: fcc6df7c am: 0954b1f7 -s ours
am: 8d93f823 -s ours
am skip reason: change_id Ic49e126ae0abfe71edd1fe000c2a0dfd2360dece with SHA1 1faea364 is in history
Change-Id: Ic903cf566798e1fb25d56d45da2f992e39eab9a1