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

Change-Id: I0442508347f32868d590adda0f6501c6dc9a077c