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