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

* commit '6040bd47f41fd56ee608f6a80a0babe942ea1df3':
  Fix ResTable_config::CONFIG_* typo (MCC vs MNC)