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

[automerger skipped] Detects all activities for whether showing work challenge am: 69b3a3cd am: d5c18447 -s ours am: 82fa6e37 -s ours am: bf62b6bf -s ours am: 7ffc0c0e -s ours am: ace05c8f -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/+/14182408

Change-Id: I63fd0040b294ee95dcb7f7647f81fe7557858195