Merge "Add agent startup-attach" into stage-aosp-master