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

Change-Id: I19b1d4b04aea9cf2bc90b0e25a18ee01c1d5863b