[automerger skipped] Merge "Add agent startup-attach" into qt-dev-plus-aosp am: 74f191c782 am: 25abf4d99a
am: 92ac76bb7d -s ours
am skip reason: change_id Ib82b27df90c7964a995288d8b2b3d348a11cdd80 with SHA1 330e8be604 is in history

Change-Id: I179af5fec9055d54b6cd1d3535024d8482b9a290