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

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

Change-Id: I66ad2b78729e732160ecfdb13b69702283a4b15a