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

[automerger skipped] Merge "Detects all activities for whether showing work challenge" into rvc-qpr-dev am: 8e9e41c0 -s ours am: 57db6898 -s ours am: 846ef0e2 -s ours am: 27a686c8 -s ours

am skip reason: Merged-In I5e09b09be547d04fdfd709cb9cd4bcd4a94bbf21 with SHA-1 87fa64eb is already in history

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

Change-Id: I91c644e95eda71d5abff5a4f29cd2430a0133996