am fdb6be8b: Merge "Always show emergency button on selector view screen in...
am fdb6be8b: Merge "Always show emergency button on selector view screen in keyguard." into jb-mr1-dev
* commit 'fdb6be8b':
Always show emergency button on selector view screen in keyguard.