Merge "Adding "attach-agent" to ActivityManagerShellCommand"
am: bd2688f4c3  -s ours

Change-Id: If1e48ecf5e75452c85e7a36f4be0d817234043c9