Revert "Don't call setLockScreenShown until we know if it's showing."

Revert submission 27770576

Reason for revert: breaks tests listed in b/346405951

Reverted changes: /q/submissionid:27770576

Change-Id: I9c610c08255bc86b5153da0d754330dc086fb6d3
2 files changed