Merge "Added --user option to 'dumpsys activity $ActivityName'." into tm-dev