This fix sim activations after wipe data (msim devices)

Change-Id: Ib25ca5c4f61a792f8016cfab998cdb95889e5a52
Merge branch 'cm-11.0' into kk_mkt
Telephony: sound formats are not translatable

Change-Id: Idf02241420479345ee778b287f60260e995104f4
Merge branch 'cm-11.0' into kk_mkt