Revert "Revert "Don't call setLockScreenShown until we know if i..."

Revert submission 27773289-revert-27770576-DGMSFQBZGQ

Reason for revert: Test failure was unrelated

Reverted changes: /q/submissionid:27773289-revert-27770576-DGMSFQBZGQ

Change-Id: I1b3a411fad1e789d2035f808f3a51348168de162
2 files changed