am ae0161e7: Merge "Don\'t handle click events on the emergency button in...
am ae0161e7: Merge "Don\'t handle click events on the emergency button in bouncer mode" into jb-mr1-lockscreen-dev
* commit 'ae0161e7':
Don't handle click events on the emergency button in bouncer mode