[automerger skipped] Merge "Switch DDS on MSIM emergency call" am: 358d253b58 -s ours
am: 0bd212a441 -s ours
am skip reason: change_id I09790ed3c15409356e34d259226a59f7107cd126 with SHA1 14cc8c40e5 is in history

Change-Id: I646e868dc42e093cda1e2bd3c7b4a5d21ea4f0b8