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
am: 7e62bf065c

Change-Id: I037d97fdcc2270b8bccb68422d102f1cd5c3ef2e