Merge "Adding "attach-agent" to ActivityManagerShellCommand" am: bd2688f4 -s ours am: d7368852 am: 8d0cdfb2 am: b9b149d9 Change-Id: I7335d4314f32a709dfc055964d3a9f3869bd8b7e