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

* commit 'b213354c413f8610fe32c504cb3986d875259c19':