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

Change-Id: I67fdb8dcceb791b5984bba37395a73c3be36a992