Merge "Show work challenge in if user in docked stack is locked am: 853304c0...
Merge "Show work challenge in if user in docked stack is locked am: 853304c0 am: d9db7c76" into nyc-mr1-dev-plus-aosp
am: a2368e30
* commit 'a2368e30':
Change-Id: I77f8905ba2cb8899e3b3dc0b269f8281cb4b223f