[automerger skipped] Merge "Add CarrierConfig for roaming PLMNS that will need emer DDS switch" into qt-qpr1-dev am: f275d96b99 -s ours
am skip reason: Change-Id I4a033f89610fd409ea81c40230938720ca76541c with SHA-1 9fd5576e60 is in history

Change-Id: Ia9d017f75d2456d2f24710db8e6e56cd30a9578b