am 62b92ab5: am 63a885d3: am 96e25b8d: Merge "Only show emergency app preference if enabled" into mnc-dev

* commit '62b92ab53dd9f7f31d3df5703357477a579e4ef8':
  Only show emergency app preference if enabled