[automerger skipped] Merge "Detects all activities for whether showing work...

[automerger skipped] Merge "Detects all activities for whether showing work challenge" into rvc-dev am: 222c4dea am: db0dc2b9 -s ours am: d8e7c143 -s ours

am skip reason: skip tag Change-Id I5e09b09be547d04fdfd709cb9cd4bcd4a94bbf21 with SHA-1 c83234a0 is already in history

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

Change-Id: I2e7c5cdc039ea349d2564df6ec0c2bc48d862066