Merge "Add agent startup-attach" into qt-dev-plus-aosp