[automerger skipped] Detects all activities for whether showing work challenge am: 6820d70823 -s ours am: 1c750cd367 -s ours am: b64eddc2c9 -s ours am: aecf7c267d -s ours am: 6adacfab63 -s ours am: 99f54b9b9e -s ours

am skip reason: Merged-In I5e09b09be547d04fdfd709cb9cd4bcd4a94bbf21 with SHA-1 69b3a3cd04 is already in history

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

Change-Id: I1b60d3b7415d6a2ff8cfb881ab73b38d31ed5870