Merge "Add dial_string_replace key to CarrierConfig" am: 715903f3c6 am: 9fba74dd3a
am: d34ae93d8b

Change-Id: I6753d00b4d9fed455cb153294f956cf3ad9f826f