Merge "Remove redundant lockscreen shown check" into oc-dev
am: 90c3489525

Change-Id: I77f82bcd38a0cb16226d58a5731c76a630c7e3be