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

[automerger skipped] Detects all activities for whether showing work challenge am: 6820d708 -s ours am: 1c750cd3 -s ours am: b64eddc2 -s ours am: aecf7c26 -s ours am: 6adacfab -s ours am: 99f54b9b -s ours

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

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

Change-Id: I1b60d3b7415d6a2ff8cfb881ab73b38d31ed5870