Merge \\\\\"DO NOT MERGE Disable app pinning when emergency call button pressed\\\\\" into mnc-dev am: fc32ec1aef am: aeba34533c am: 317d0cb169 am: edace5e820  -s ours
am: f184789ae9

Change-Id: I78ee2340cb7a4a42eb9c60d41a7947b9bb6f6a11