Merge "Add agent startup-attach" into qt-dev-plus-aosp am: 74f191c782
am: 25abf4d99a

Change-Id: I4caa4c4af263544bf76278397e67b283c2f6ef40