Update activity.c

another am invocation with unconditional --user (the last one on line 185 needs no condition as it is only called in multiuser mode)
Merge pull request #208 from h1618/patch-1

Update activity.c
Merge remote-tracking branch 'upstream/master' into kk-mr0