Merge "Merge "Make "work mode on dialog" show personal challenge in unified...
Merge "Merge "Make "work mode on dialog" show personal challenge in unified work lock" into nyc-dev am: 4ace8366 am: eeec5889" into nyc-mr1-dev-plus-aosp
am: 5e4a6bbd
* commit '5e4a6bbd':
Change-Id: Iba8198dbb84dc0f811003c25ac951c635f35afd0