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