Merge "Merge "Disable app pinning when emergency call button pressed" into nyc-dev am: 8b655e0f57 am: fe9877d877" into nyc-mr1-dev-plus-aosp
am: 1bc922b544

* commit '1bc922b544549d2d5b3e45603b0c28da8d140b72':

Change-Id: Ie90cc4e830297a1410ac51822b3252f293b15661