Merge "Merge "Adding "attach-agent" to ActivityManagerShellCommand" am: bd2688f4c3  -s ours" into stage-aosp-master
am: 258790a2ea

Change-Id: I82e68dd1ad007b8962f8ee73de2429dbe3e23959