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

Change-Id: I19c6eeb5325ec30810138ca466b232cec9894c21