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

Change-Id: I09f88b45fd4deea370246dc74465a3db702d8078