Merge "Disable app pinning when emergency call button pressed" into nyc-dev
am: 8b655e0f57

* commit '8b655e0f57b071756e7d6a3547eeabe35885bcc9':
  Disable app pinning when emergency call button pressed

Change-Id: Ibe8d37716ad1630359b3ef08350f485b0d1177a7