[automerger skipped] Merge "Add agent startup-attach" into stage-aosp-master
am: 366a542843 -s ours
am skip reason: change_id Ib82b27df90c7964a995288d8b2b3d348a11cdd80 with SHA1 ca8502a7f5 is in history

Change-Id: I7b4caae0fe0503363d23f6b93dae8822af451766