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

* commit '49459e4ee88dbaa342fb6add9af51ccbadc88d98':
  Disable app pinning when emergency call button pressed

Change-Id: I6cf2181d2f2f8a897b2d5eb8ab9482c11a55dd3c