Merge \"DO NOT MERGE Disable app pinning when emergency call button pressed\" into mnc-dev
am: fc32ec1aef

Change-Id: I04ff0004a9112cfbe7e61b2fa6cb3fd4f037bbd0