Don't change the default account when saving contacts (E2)

Also address some comments on ag/766424 that were given
after that CL was submitted.

Bug 23667287
Bug 23589603

Change-Id: If2a5aee5c17358278fd3b59ed56b4c5344e5ecf6
2 files changed