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