Merge "Add PhoneAccount check to addExistingConnection" into nyc-mr1-dev