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

[automerger skipped] Detects all activities for whether showing work challenge am: fe5e1432 -s ours am: 850810d0 -s ours am: 62c71ab0 -s ours am: dcb100da -s ours am: eccd031f -s ours am: 38d80ad9 -s ours am: 641712de -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/+/14188081

Change-Id: I364435850797d3e9f87af94555a52ca70cd08130