Merge "Update work challenge to align with material next" into sc-v2-dev am: e5f5532902

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16220983

Change-Id: Icb10080a6f813815cd717ac5cfd6dcd023c2e1f2