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

Change-Id: Ia54f61dccce81147b42c87691d0f49d5e78dead4