Merge \"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: 4eff005260\" into nyc-mr1-dev-plus-aosp
am: ab1383d161  -s ours

Change-Id: Ie9cae84613360c545b9b578903e965eb1adbb8c5