Merge "Remove option to configure emergency app" into nyc-dev
am: 06b7d7cdf9

* commit '06b7d7cdf954902dad8fde766fe54ea315a463b3':
  Remove option to configure emergency app

Change-Id: Ia306455b8fe44d6e42493937fce6ad92904737fe