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