Merge "Update ConnOnActivityStartTest to be hermetic." into oc-mr1-dev