[automerger skipped] Merge "Add agent startup-attach" into stage-aosp-master am: 366a542843 -s ours am: 6a67897e85 -s ours am: 9a26425282 -s ours
am:10fde968a8-s ours am skip reason: change_id Ib82b27df90c7964a995288d8b2b3d348a11cdd80 with SHA1330e8be604is in history Change-Id: I036bfe95e349716ead0ed7c197ac5cde221f8ce8
This commit is contained in: