Merge "Revert "Fix work challenge lockscreen being dismissed"" into rvc-dev am: 9e71cab6 am: 57ce21a3 Change-Id: I6e20a8f6192aaab9f45d7bf13aabdcc414c21ec2