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