Merge "Output modified bcp47 tag in ResTable_config::toString()"