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

Change-Id: I18ce0a2d49ab95c89e8318d009112f3c126b58ad