Merge "Fix ResTable_config::CONFIG_* typo (MCC vs MNC)"