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

Change-Id: I7335d4314f32a709dfc055964d3a9f3869bd8b7e