Revert "Merge pull request #19374 from mnjul/bug_1011645_lockscreen_passcode_camera_button_stall_v1.3"

This reverts commit e74f2080cc58e78957809305a27afdc1b062f876, reversing
changes made to e049de79ff46fcab51f29a88d5869c5efb48fc3c.
Merge pull request #20469 from mnjul/v1.3

Revert "Merge pull request #19374 from mnjul/bug_1011645_lockscreen_pass...