am 870a9e6a: Merge "Added a carrier config key for emergency messages on/off option always showing." into mnc-dr-dev

* commit '870a9e6a783c7755b059d8533ae0232873bff9ba':
  Added a carrier config key for emergency messages on/off option always showing.