[automerger skipped] Merge "Add CarrierConfig for roaming PLMNS that will need emer DDS switch" am: 7de7f018e8 am: 130286de4e am: 5bd2cfe59b -s ours
am skip reason: Change-Id I4a033f89610fd409ea81c40230938720ca76541c with SHA-1 82dc27913f is in history

Change-Id: I420dabdbd1855103ef53eb30d3c549a857181768