Merge "Adding "attach-agent" to ActivityManagerShellCommand" am: 05dfd10254 am: db0803b4e8 am: 7bf598cbd9
am: de021d8162  -s ours

Change-Id: I619e8cd9eaed26901fa90c48b00a5208d751b899