Merge "Adding "attach-agent" to ActivityManagerShellCommand"