Merge "Added --user option to 'dumpsys activity service'."