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

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

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

Change-Id: I1493eed504f3a8c569cad81e16007c3cc03924e2