am d16dedf3: am 67ebb2f8: am 957b27f6: Merge "Revert "Always show emergency...

am d16dedf3: am 67ebb2f8: am 957b27f6: Merge "Revert "Always show emergency button on selector view screen in keyguard."  I\'m reverting for now while we sort out the actual requirements.  Sorry for the thrash, Jaggies.  I\'ll handle re-adding it if needed." into jb-m

* commit 'd16dedf3':
  Revert "Always show emergency button on selector view screen in keyguard."  I'm reverting for now while we sort out the actual requirements.  Sorry for the thrash, Jaggies.  I'll handle re-adding it if needed.