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