Merge "Remove key_ prefix from CarrierConfig Strings"