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

Change-Id: Iafeb38ea7de7b233914e2abc8a251061921bf62a