Merge "Implement code for getting contact-default phone acct" am: eb496c3adb
am: 0a573e00d3

Change-Id: Ia259a88fb423fa254f02db33162025248afbbe06