Merge "Revert "Fix work challenge lockscreen being dismissed"" into rvc-dev am: 9e71cab6 am: 022bc437 Change-Id: I7880677557bd37d89dd3eda8e45bd9257ba1ef43