am eca59824: am b213354c: (-s ours) am 6f752c88: Migrate existing SIP PhoneAccount IDs to username.

* commit 'eca598248c2ea85aeade359b8573dd6f6001db71':