Fixed linking phoneNumber to existing accounts (Android)

[cqhchan]

• Fixed a few bugs with the previous implementation of linking with credentials on android
• Added on functionality to choose between signing in or linking on Auto Verification.

[cqhchan]

@kroikie i noted an issue with #928 that was approved a few days ago and have since fixed it. How do i go about requesting a review?

[googlebot]

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to determine that you authored the commits in this PR. Maybe you used a different email address in the git commits than was used to sign the CLA? If someone else authored these commits, then please add them to this pull request and have them confirm that they're okay with them being contributed to Google. If there are co-authors, make sure they're formatted properly.
In order to pass this check, please resolve this problem and have the pull request author add another comment and the bot will run again. If the bot doesn't comment, it means it doesn't think anything has changed.