Merge "Add equality method for PhoneAccount." am: 6af1516b22 am: 491be78832
am: 24bcf8b5d1

Change-Id: Ibd0c69425bf185dc6b79db4ca4e9ca4a770320a3