Merge "Check addExistingConnection for correct PhoneAccount" into nyc-mr1-dev