Merge "Adding "attach-agent" to ActivityManagerShellCommand"
am: 05dfd10254

Change-Id: I3623f617319f03bad87f65b61959ec2ce822ac7e