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

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

Change-Id: Ib2c7b38dc76033c04feb43137c9526e38b472149